Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 30 pull requests #35365

Merged
merged 73 commits into from
Aug 5, 2016
Merged

Rollup of 30 pull requests #35365

merged 73 commits into from
Aug 5, 2016

Conversation

GuillaumeGomez and others added 30 commits July 29, 2016 14:32
Beginners may try to adapt the tutorial to develop their own code.
When using different dependencies, they may use the wildcard for
versioning.  Since they are new to the language, they will not know
that the wildcard asterisk is a string, not a token.  Make the correct
format more explicit, to remove one potential source of frustration.
This adds a question and answer to the Q&A section of the Copy
docs. Specifically, it asks the question I asked while reading
the docs, and gives its answer.
Was surprised to learn that heaps were used in this way, then realized upon reading [the linked paper](http://www.cs.cmu.edu/afs/cs/academic/class/15213-f98/doc/dsa.pdf) that it's a totally different type of heap—an important distinction.
…turner

Update error format for E0062

Fixes rust-lang#35217 as part of rust-lang#35233

There seems to be an issue with the old format ignoring the labels which results in the incorrect line being rendered in the old format. I spoke with @jonathandturner about this and it seems to be a bug. Pertinent information [here](https://gist.github.com/trixnz/ad11e68687529e164427df8f8eb63116).

r? @jonathandturner
…andturner

Update compiler error E0055 to use new error format

Addresses rust-lang#35213, Part of the rust-lang#35233 meta bug

r? @jonathandturner
…urner

Fix for issue rust-lang#35336 - updating error message for for E0368 to includ…

…e a span_label.

This fixes rust-lang#35336 as part of rust-lang#35233

r? @jonathandturner
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit cd48161 has been approved by GuillaumeGomez

@GuillaumeGomez
Copy link
Member Author

@bors: p=1

@GuillaumeGomez
Copy link
Member Author

@bors: r-

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit cd48161 has been approved by GuillaumeGomez

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Aug 5, 2016

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit cd48161 has been approved by GuillaumeGomez

@GuillaumeGomez
Copy link
Member Author

@bors: rollup-

@bors
Copy link
Contributor

bors commented Aug 5, 2016

⌛ Testing commit cd48161 with merge b30eff7...

bors added a commit that referenced this pull request Aug 5, 2016
@bors
Copy link
Contributor

bors commented Aug 5, 2016

💔 Test failed - auto-linux-64-debug-opt

@GuillaumeGomez
Copy link
Member Author

@bors: retry

@bors bors merged commit cd48161 into rust-lang:master Aug 5, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch August 5, 2016 21:43
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.